Skip to content
This repository was archived by the owner on Mar 20, 2024. It is now read-only.

Feemarket strategy#308

Merged
hackfisher merged 44 commits into
masterfrom
darwinia-feemarket-strategy
Nov 22, 2021
Merged

Feemarket strategy#308
hackfisher merged 44 commits into
masterfrom
darwinia-feemarket-strategy

Conversation

@fewensa
Copy link
Copy Markdown
Contributor

@fewensa fewensa commented Nov 5, 2021

@fewensa fewensa marked this pull request as ready for review November 10, 2021 07:18
@fewensa fewensa marked this pull request as draft November 10, 2021 10:25
@fewensa fewensa marked this pull request as ready for review November 11, 2021 11:47
@fewensa fewensa marked this pull request as draft November 11, 2021 11:58
Comment thread components/client-pangolin-s2s/src/feemarket.rs Outdated
Comment thread components/client-pangolin-s2s/src/feemarket.rs Outdated
Comment thread components/client-pangolin-s2s/src/feemarket.rs Outdated
Comment thread components/client-pangolin-s2s/src/feemarket.rs Outdated
Comment thread components/client-pangolin-s2s/src/feemarket.rs Outdated
Comment thread task/task-pangolin-pangoro/src/service/fee.rs Outdated
Comment thread task/task-pangolin-pangoro/src/service/fee.rs Outdated
Comment thread task/task-pangolin-pangoro/src/service/fee.rs Outdated
Comment thread task/task-pangolin-pangoro/src/service/fee.rs Outdated
Comment thread task/task-pangolin-pangoro/src/service/fee.rs Outdated
@fewensa fewensa marked this pull request as ready for review November 11, 2021 12:33
@fewensa fewensa force-pushed the darwinia-feemarket-strategy branch from 6f4ef95 to 37abc2f Compare November 12, 2021 04:16
@fewensa fewensa marked this pull request as draft November 12, 2021 06:05
Comment thread components/client-pangolin-s2s/src/api.rs
…strategy

# Conflicts:
#	Cargo.lock
#	components/client-pangolin-s2s/Cargo.toml
#	components/client-pangoro-s2s/Cargo.toml
#	task/task-pangolin-pangoro/Cargo.toml
@fewensa
Copy link
Copy Markdown
Contributor Author

fewensa commented Nov 16, 2021

Done. Can be reviewed.
There is still some work to prepare before the merge.

@fewensa fewensa marked this pull request as ready for review November 16, 2021 08:41
@hackfisher
Copy link
Copy Markdown
Contributor

@fewensa fewensa marked this pull request as draft November 19, 2021 09:50
@fewensa fewensa marked this pull request as ready for review November 22, 2021 03:18
@hackfisher
Copy link
Copy Markdown
Contributor

@fewensa request merge and conflict resolution.

@hackfisher hackfisher merged commit b7085fa into master Nov 22, 2021
@hackfisher hackfisher deleted the darwinia-feemarket-strategy branch November 22, 2021 06:37
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants